Skip to content

pdal: 2.5.6 -> 2.6.2#273948

Merged
nh2 merged 2 commits intoNixOS:masterfrom
imincik:pdal-2.6.2
Jan 14, 2024
Merged

pdal: 2.5.6 -> 2.6.2#273948
nh2 merged 2 commits intoNixOS:masterfrom
imincik:pdal-2.6.2

Conversation

@imincik
Copy link
Contributor

@imincik imincik commented Dec 13, 2023

Description of changes

Update PDAL to the latest version.

List of changes:

This PR is replacing #271463 .

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@imincik imincik mentioned this pull request Dec 13, 2023
Closed
13 tasks
@ofborg ofborg bot requested review from das-g, nh2, nialov, sikmir and willcohen December 13, 2023 11:40
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 13, 2023
@imincik imincik marked this pull request as draft December 13, 2023 17:50
@imincik
Copy link
Contributor Author

imincik commented Dec 13, 2023 •
edited
Loading

Result of nixpkgs-review pr 273948 run on x86_64-linux 1

1 package failed to build:
  • qgis-ltr
5 packages built:
  • cloudcompare
  • entwine
  • grass
  • pdal
  • qgis

QGIS LTR error:

       > CMake Error at cmake/FindPDAL.cmake:76 (MESSAGE):
       >   Could not find PDAL
       > Call Stack (most recent call first):
       >   CMakeLists.txt:437 (find_package)

@imincik
Copy link
Contributor Author

imincik commented Dec 13, 2023

QGIS LTR needs qgis/QGIS#54940 to be backported .

@nixos-discourse
Copy link

nixos-discourse commented Dec 18, 2023

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/week-in-geospatial-team-11-17-dec-2023/37035/1

@wegank wegank mentioned this pull request Jan 5, 2024
Closed
13 tasks
@jtojnar
Copy link
Member

jtojnar commented Jan 7, 2024

Can we merge this to staging-next? qgis-ltr will be already broken there due to pdal being broken.

@imincik
Copy link
Contributor Author

imincik commented Jan 8, 2024

Can we merge this to staging-next? qgis-ltr will be already broken there due to pdal being broken.

I am not aware of PDAL being broken. What do you mean by that ?

Current blockers for merging this PR are:

@jtojnar
Copy link
Member

jtojnar commented Jan 8, 2024

I am not aware of PDAL being broken. What do you mean by that ?

See #275620 (comment)

@imincik
Copy link
Contributor Author

imincik commented Jan 8, 2024 •
edited
Loading

PR rebased with current master.

Result of nixpkgs-review run on x86_64-linux 1

1 package failed to build:
  • qgis-ltr
5 packages built:
  • cloudcompare
  • entwine
  • grass
  • pdal
  • qgis

@ofborg ofborg bot requested a review from r-burns January 8, 2024 14:41
@imincik
Copy link
Contributor Author

imincik commented Jan 8, 2024

Options to fix QGIS-LTR:

  1. keep local version of PDAL 2.5.6 and build QGIS-LTR with that until Fix CMake FindPDAL for PDAL version 2.6+ qgis/QGIS#54940 is backported
  2. manually create working patch from Fix CMake FindPDAL for PDAL version 2.6+ qgis/QGIS#54940 and apply it to QGIS-LTR
  3. disable PDAL for QGIS-LTR

Which option would you choose ?

@imincik
Copy link
Contributor Author

imincik commented Jan 8, 2024

Option 1 implemented in 5c5e820

@imincik
Copy link
Contributor Author

imincik commented Jan 8, 2024

Result of nixpkgs-review run on x86_64-linux 1

6 packages built:
  • cloudcompare
  • entwine
  • grass
  • pdal
  • qgis
  • qgis-ltr

@imincik imincik marked this pull request as ready for review January 8, 2024 16:17
@ofborg ofborg bot requested a review from lsix January 8, 2024 16:18
@imincik
Copy link
Contributor Author

imincik commented Jan 8, 2024

Can we merge this to staging-next?

@jtojnar , this PR is ready for review now.

@imincik imincik mentioned this pull request Jan 8, 2024
Merged
@nixos-discourse
Copy link

nixos-discourse commented Jan 9, 2024

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/week-in-geospatial-team/37035/2

@nh2
Copy link
Contributor

nh2 commented Jan 14, 2024

Changes and the mentioned build fix look good, merging.

@nh2 nh2 merged commit ec9f051 into NixOS:master Jan 14, 2024
@imincik imincik deleted the pdal-2.6.2 branch January 15, 2024 08:47
@imincik imincik mentioned this pull request Jan 15, 2024
Merged
13 tasks
@nixos-discourse
Copy link

nixos-discourse commented Jan 16, 2024

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/week-in-geospatial-team/37035/3

imincik added a commit to imincik/geospatial-nix that referenced this pull request Jan 19, 2024
@imincik
pkgs(pdal): 2.5.6 -> 2.6.2
a037890 
Nixpkgs PR:
NixOS/nixpkgs#273948
imincik added a commit to imincik/geospatial-nix that referenced this pull request Jan 19, 2024
@imincik
pkgs(qgis-ltr): build with pdal 2.5
265cb5a 
Nixpkg PR:
NixOS/nixpkgs#273948
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@willcohen willcohen Awaiting requested review from willcohen

@nialov nialov Awaiting requested review from nialov

@das-g das-g Awaiting requested review from das-g

@nh2 nh2 Awaiting requested review from nh2

@sikmir sikmir Awaiting requested review from sikmir

@r-burns r-burns Awaiting requested review from r-burns

@lsix lsix Awaiting requested review from lsix

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@imincik @nixos-discourse @jtojnar @nh2